Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 15:49:37 +0000 (07:49 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 15:49:37 +0000 (07:49 -0800)

Trivial merge